From 12c049d18d0e9dc1065c077029b1c5103c3caa3d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 22 Aug 2016 15:07:18 +0300 Subject: [PATCH] Don't special case root package for overrides --- src/cargo/ops/cargo_compile.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index 3ea700f49..2b58a0311 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -388,17 +388,12 @@ fn add_overrides<'a>(registry: &mut PackageRegistry<'a>, Some(list) => list, None => return Ok(()) }; - let current = try!(ws.current()); let paths = paths.val.iter().map(|&(ref s, ref p)| { // The path listed next to the string is the config file in which the // key was located, so we want to pop off the `.cargo/config` component // to get the directory containing the `.cargo` folder. (p.parent().unwrap().parent().unwrap().join(s), p) - }).filter(|&(ref p, _)| { - // Make sure we don't override the local package, even if it's in the - // list of override paths. - current.root() != &**p }); for (path, definition) in paths { -- 2.30.2